Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 16 Feb 2010 04:18:57 +0000 (04:18 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 16 Feb 2010 04:18:57 +0000 (04:18 +0000)

Trivial merge